scheduler: add conflict detect for grant hot leader scheduler #4903

lhy1024 · 2022-05-07T09:25:04Z

Signed-off-by: lhy1024 admin@liudos.us

What problem does this PR solve?

Issue Number: Ref #4399

Check List

Tests

No code

Release note

 None.

ti-chi-bot · 2022-05-07T09:25:05Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

bufferflies

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

JmPotato · 2022-05-07T09:30:19Z

tools/pd-ctl/pdctl/command/scheduler.go

@@ -329,7 +329,7 @@ func NewLabelSchedulerCommand() *cobra.Command {
 func NewGrantHotRegionSchedulerCommand() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "grant-hot-region-scheduler <store_leader_id> <store_leader_id,store_peer_id_1,store_peer_id_2>",
-		Short: "add a scheduler to grant hot region to fixed stores",
+		Short: "add a scheduler to grant hot region to fixed stores. Note: balance-hot-region-scheduler must be paused.",


Could we do some actual checks to prevent these two schedulers from working at the same time?

codecov · 2022-05-07T09:40:47Z

Codecov Report

Attention: Patch coverage is 74.19355% with 8 lines in your changes missing coverage. Please review.

Project coverage is 77.66%. Comparing base (f3e9d9a) to head (1f7991c).
Report is 2 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4903      +/-   ##
==========================================
+ Coverage   77.64%   77.66%   +0.02%     
==========================================
  Files         474      474              
  Lines       62112    62140      +28     
==========================================
+ Hits        48228    48264      +36     
+ Misses      10333    10321      -12     
- Partials     3551     3555       +4

Flag	Coverage Δ
unittests	`77.66% <74.19%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

lhy1024 · 2022-05-16T07:01:24Z

/hold

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 · 2024-09-23T02:40:34Z

/retest

bufferflies · 2024-09-23T13:46:00Z

tools/pd-ctl/pdctl/command/scheduler.go

-		Run:   addSchedulerForGrantHotRegionCommandFunc,
+		Use: "grant-hot-region-scheduler <store_leader_id> <store_leader_id,store_peer_id_1,store_peer_id_2>",
+		Short: `add a scheduler to grant hot region to fixed stores. 
+				Note: If there is balance-hot-region-scheduler running, please remove it first, otherwise grant-hot-region-scheduler will not work.`,


is it ok if the hot scheduler is not work but exist, for example being pause status?

In this pr, even though the hot-scheduler is paused, adding grant-hot-leader-scheduler is still not allowed.

If this is allowed, let's look at an example where I suspend the hot-scheduler for ten seconds and then add grant-hot-leader-scheduler, which is fine for ten seconds, but after ten seconds the hot-scheduler resumes scheduling and they will conflict again.

Ok, understand. BTW, the hot scheduler config still exist if I enable it again.

Yes, the configuration still exists. If you think this pr is ok, I will cancel /hold.

bufferflies · 2024-09-24T02:40:42Z

LGTM

lhy1024 · 2024-09-24T02:49:46Z

/unhold it still need an approve

rleungx · 2024-09-25T06:35:51Z

tools/pd-ctl/tests/scheduler/scheduler_test.go

@@ -488,12 +488,32 @@ func (suite *schedulerTestSuite) checkSchedulerConfig(cluster *pdTests.TestClust
 	})

 	// test grant hot region scheduler config
-	checkSchedulerCommand(re, cmd, pdAddr, []string{"-u", pdAddr, "scheduler", "add", "grant-hot-region-scheduler", "1", "1,2,3"}, map[string]bool{
+	// case 1: add grant-hot-region-scheduler when balance-hot-region-scheduler is running


It should not belong to the scheduler config test.

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx · 2024-09-25T07:14:31Z

server/api/scheduler.go

+		return schedulers.([]string), nil
+	}
+
+	addr, ok := h.svr.GetServicePrimaryAddr(h.svr.Context(), constant.SchedulingServiceName)


Why do we need to query schedulers from the scheduling service?

Because we need to check whether hot scheduler is disabled.

PD has the same configuration as the scheduling service?

rleungx · 2024-09-25T07:20:18Z

tools/pd-ctl/pdctl/command/scheduler.go

-		Use:   "grant-hot-region-scheduler <store_leader_id> <store_leader_id,store_peer_id_1,store_peer_id_2>",
-		Short: "add a scheduler to grant hot region to fixed stores",
-		Run:   addSchedulerForGrantHotRegionCommandFunc,
+		Use: "grant-hot-region-scheduler <store_leader_id> <store_leader_id,store_peer_id_1,store_peer_id_2>",


BTW, is it necessary to set store_leader_id again?

Sure, I also think it is not necessary. I will modify it in another pr.

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot · 2024-09-25T08:18:07Z

@lhy1024: You cannot manually add or delete the reviewing state labels, only I and the tursted members have permission to do so.

In response to removing label named needs-1-more-lgtm.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot · 2024-09-25T08:37:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bufferflies, JmPotato, rleungx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [JmPotato,bufferflies,rleungx]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ti-chi-bot · 2024-09-25T08:37:59Z

[LGTM Timeline notifier]

Timeline:

2024-09-25 08:10:14.74561145 +0000 UTC m=+1639884.486035389: ☑️ agreed by rleungx.
2024-09-25 08:37:58.385691774 +0000 UTC m=+1641548.126115729: ☑️ agreed by JmPotato.

ti-chi-bot · 2024-09-25T08:44:19Z

@lhy1024: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-integration-realcluster-test	`1f7991c`	link	false	`/test pull-integration-realcluster-test`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label May 7, 2022

ti-chi-bot requested review from HunDunDM and JmPotato May 7, 2022 09:25

lhy1024 added the require-LGT1 Indicates that the PR requires an LGTM. label May 7, 2022

lhy1024 requested a review from bufferflies May 7, 2022 09:25

bufferflies approved these changes May 7, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 7, 2022

JmPotato reviewed May 7, 2022

View reviewed changes

ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2022

ti-chi-bot added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Apr 2, 2024

lhy1024 changed the title ~~scheduler: add comment for grant hot leader scheduler~~ scheduler: add conflict detect for grant hot leader scheduler Sep 13, 2024

scheduler: add conflict detect for grant hot leader scheduler

071b116

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 13, 2024

lhy1024 force-pushed the grant branch from dfd226d to 071b116 Compare September 13, 2024 08:15

ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 13, 2024

ti-chi-bot bot added the approved label Sep 13, 2024

lhy1024 removed the approved label Sep 13, 2024

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2024

rename for lint

4052699

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 13, 2024

bufferflies reviewed Sep 23, 2024

View reviewed changes

lhy1024 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2024

lhy1024 requested review from JmPotato and rleungx September 25, 2024 02:22

rleungx reviewed Sep 25, 2024

View reviewed changes

move test

ec5ecf9

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx reviewed Sep 25, 2024

View reviewed changes

address comments

201adb5

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx approved these changes Sep 25, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 25, 2024

lhy1024 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 25, 2024

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 25, 2024

lhy1024 added 2 commits September 25, 2024 16:24

Merge branch 'master' of github.com:tikv/pd into grant

d3a9bf7

reduce duplicate code

1f7991c

Signed-off-by: lhy1024 <admin@liudos.us>

JmPotato approved these changes Sep 25, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 25, 2024

ti-chi-bot bot merged commit 7907679 into tikv:master Sep 25, 2024
23 of 25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

scheduler: add conflict detect for grant hot leader scheduler #4903

scheduler: add conflict detect for grant hot leader scheduler #4903

lhy1024 commented May 7, 2022 •

edited

Loading

ti-chi-bot commented May 7, 2022 •

edited

Loading

JmPotato May 7, 2022

lhy1024 May 7, 2022

codecov bot commented May 7, 2022 •

edited

Loading

lhy1024 commented May 16, 2022

lhy1024 commented Sep 23, 2024

bufferflies Sep 23, 2024

lhy1024 Sep 24, 2024

bufferflies Sep 24, 2024

lhy1024 Sep 24, 2024

bufferflies commented Sep 24, 2024

lhy1024 commented Sep 24, 2024

rleungx Sep 25, 2024

rleungx Sep 25, 2024

lhy1024 Sep 25, 2024

rleungx Sep 25, 2024

lhy1024 Sep 25, 2024

rleungx Sep 25, 2024 •

edited

Loading

lhy1024 Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

scheduler: add conflict detect for grant hot leader scheduler #4903

scheduler: add conflict detect for grant hot leader scheduler #4903

Conversation

lhy1024 commented May 7, 2022 • edited Loading

What problem does this PR solve?

Check List

Release note

ti-chi-bot commented May 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented May 7, 2022 • edited Loading

Codecov Report

lhy1024 commented May 16, 2022

lhy1024 commented Sep 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bufferflies commented Sep 24, 2024

lhy1024 commented Sep 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rleungx Sep 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

ti-chi-bot bot commented Sep 25, 2024

[LGTM Timeline notifier]

ti-chi-bot bot commented Sep 25, 2024

lhy1024 commented May 7, 2022 •

edited

Loading

ti-chi-bot commented May 7, 2022 •

edited

Loading

codecov bot commented May 7, 2022 •

edited

Loading

rleungx Sep 25, 2024 •

edited

Loading